CFY-1232 extract more stuff to handlers