Split handler of composer. Names changed