Finish implementation of VariableMap