Added dictionary support to fully rely on the var

This means that we now can use any value in the dictionary.