More POM updates
Reuse hashmap in iterator
@Ignoring tests failing due to what appears to be a race condition