Added in group to and from parsing