Second step of fixing model.staff