Separated transformer from delivery handler.