Refactor because of clTRID