New Terminal implementation