corrected db scheme