Add async worker execution; TODO on HS upgrade.