Updated DB schema

Database amends
Validation work