Switched to executors from plain threads