Small changes on Entities