Refactoring of transformer API
Refactoring of transformer API