Added Storage utils