added fix to load the data container in static classes