Extract transformer to separate class