Incorporate new group handling
Match file layout to latest schema strategy
Version bump