Changed the entity key a bit