changed schema to preserve inheritance