New schema, now using abstract patterns