Added CLI listing option