Updated to have direct query deependency (instead of web jar)