Refactor to configuration through storage_options

For #16