Added support for transformations