Better organization for template and host generation. Var check removed