Fix of database/entities issue