Better handling of new lists