Updated DB scheme and migrations to include defaults and non-nulls