Amendments to database table definitions

Amendments to database table definitions.