Added Terminal support