added department and Class to core models