More Work on entities