Fixed: Database enhancement