Refactor to make Services