Edit SMQuery methods to add values using mutable dictionary