fixed DB table structures