Major overhaul of lists