Extend benchmark
Speed up and clean up group/wrap transformations