Changes to transformer and data type system