db schema fixed