Upgraded Class Query to 0.1.6