Successfully refactored part of the Database class. Removed Route model dependency