More work on Entities