CLOUD-252 some change on resource handling