Added separate listeners for Course/Department