Add in the optional propertys when present