Added --list_only functionality