Feature/cloudify 2393 storage impl phase 2