Merge "refactor of ceph model"