make delivery direct or not using configuration flag and use of new core object