Refactored TwrexStructurer - Hash only checked if passed in entity