Before Continue Group Refactoring
Introduce Domain