Added infra_hostname field and change some fieldname and type