Changes for entites moving to separate jar etc.