Refactoring: changed func names to *DB pattern