Including new queryproxy class