Add addr fields name and email. Better texts