Optional Mandatory Fields now implemented