Added terminal types