Working on interests, groups and refactoring