Upated the basic  entity stuff here