Allowing two levels of nested storage directories
Removed redundant attribute with delayed delivery