Setting data should now work; default data to null instead of empty object