Added support for Terminator