Added CLI mode