Added needs and schools to model