Removed query_builder as optional (default to null)