Improved hierarchy for storage / resource.
Improved lock storage creation.