Add ability to use shared storage