Parameterized all variables.

It's easier to upgrade and change the variable when they are parameterized.
I also made them scop aware like the other ones.