Add Query Classes