Add storage support (no tests yet around the actual service)