Added possibility to inject query unwrappers