Updated Monarch/libthorax