Tweaking how custom type data and format data are stored and updated