CLOUDIFY-1587 Refactoring