Removed some Mandatory Fields

Updated Model and Mapper