updates to entity-7.x-1.0