MergeVars instead of dictionaries

Updated a couple of methods to return mergevars.