Updated QueryMessage to follow memberconvention