Enhance --list option