Storage pool support

@Nullable or @Nonnull?