Added required on fields