Add support for different storage type #5