Introduces vars per role
Minor changes