changes to the data container format, abstracted away Classy in prep for eventual removal