Added required fields