Match the new type system