Improve raven CLI