New structure and added easy phone field function