Improve the list command