Database schema fixed