Updated for recent DB changes