Added structure for schema defs.