Working on service refactoring.