corrected db scheema