Updates for schema and config