Added FML support to the Query Protocol