Changed storage service to be more modular