Refactor access to DB collections