Simplified the database