Entity related stuff
Whoops, weird bug in git
Prefinal add