More Work On Entities