schema and code changes