Added query push down features