Add support for storage pools