Improving type system.