Fixed DatabaseManager