CLOUDIFY-2532 more validations?