Added CLI tool