DBService refactored