Updates to type system.