Made the terminal more api friendly