Revised DB schema, now with moar normalization