Improved list command