Updated type checker