New classes were added to handle each part of the query