Re-add management spec
Re-add cloudservices module