added storage support