Added classes to deal with table refs