Refactored Entity classes. Added CheckDepartment Entity