Updated everything to work with Thor.