Added Return and Terminator base class.