Some work on the Entities design.