Add io executor service. Fix breakage