Wrap page and block storages in services