Upgraded Class Query to 0.2.1