More work on Entity.