Clean the code
Added CaaS and CIC Server related properties.
Added customer contact property.