Added options to type system.