Add proper type system.