Re-add cloudservices module