Change Storage constructor