Add db changes from Jackson and Wang Jun