Further normalized and made more accurate the schema