CLC-1916 Fill in more class data from Oracle