Continued working on DatabaseManager