Refactor added require yaml
Refactor added group method