Refactor Repository impl for DB proj