Extending QueryMessage instead of overriding