Improved handling of old data.