More work in the Entities design