Updated for DB changes