Wip transformation refactoring