Added proper school related field