Changes to type system