Modified implicit struct creation to work with CF 8 and 9.