Add more lists, more clever update