Move core options to deferred push callback