Added query message types and reply message types