changes for schema and in support of fab migration