#59 Added class orderby
#60 Added class groupby