Added more fields. Phone number pre-processing