Added storage support