Added more required fields