more work on the entity table