Issue #76 - Refactoring Account and Group