Added Terminal handler.