Refactoring to support updated Typheous. EX-2493