Added a prelim Entity Class