Modification for required fields