Refactor DB DAO and pip-requires