DB Integration Changes - I