make storage configurable in preparation for database storage