Removed mandatory field requirement