added storage helpers