#85 Added populating StaffAssignment