Executor thread safety improved, API updated