Added refactor changes to backend services