device storage shared helpers added