Refactor services fix