Restructuring PbMap (3rd try)