Added terminal functionality