slight API change to expose all data