Migrate to new CatchableThread class