Fixed DB schema one more time