Serializers for Queries and replies updated