DPC-197 - proper mappings - minimal data