New Updates to entity model
more updates