Before reverting to much simpler DB schema.