No need for these reference classes anymore