Improved list handling