Refactor DBManager