Modified entities and database structure