Contact data

Add support for email= fax= phone= and website= contact data