Update Thor API

@juliandunn can you test and see if this fixes #1156?