changed design of entity module