Refactored Xcp_service a little bit more