Refactoring DB management
DB management