Added terminal typing