Updated few DB classes