Added variables and modifiers