Add defaults for schema definition