Add ability to pass storage parameters