Fixed grouping & documented changes from 1.x