Storage pool support

Can you mark this @Nullable please?