Updated demo app model and map to include key path example