Improve list command