Map more fields to CPIMS