Refactoring due to OpenCloud update(s)