Added value sets for vars and elements