CLOUDIFY-1808 refactoring/validation added