Added CLI execution support