Treasury manual mappings - take 2