include dapperqueryexecutor and adjust delivery properties