added possibility to choose the storage