Removed query package dependency