Yannis: moving to new transformer API