Added Storage utils
merged