Updated type system with last modifications