Added CLI functionality