Added Orika for some mappings 
Separated out PhoneType