added fields, extended controller and views for pupil