Bit of refactoring in IChainer