Simplification of the database model