Updates method to correct name and adds method descriptions
Removes Builder class in favour of having the aliasing in Query