Moved transformations to trait