Community service refactoring