Added CLI code.