Refactor fabric.Group