Implemented changes to support Query and Parameter in transformers