Added additional information to hosts and template forms