Updated workflow with new group structure