Add basic support for terminal type