Added transformation policy support