Working on mandatory and optional fields