Update schema to reflect recent changes
Declare charset