DB schema fixed