Add hierarchical PipeMap in place of HashMaps