Added a mapping for the demo schema (not tested yet)