db schema corrected