Added CLI interaction