Added changes for refactoring the Group but not working yet