Completion - Use the new options to the list command