improve the entities