Intial changes for Storage