Replaced with Thor usage