Renamed data, added updater and am improving error handling