Continue service refactor