Restructuring PbMap examples (Second try)