mapper: refactoring, created ChainHandler