Modify grammar to support Create STORAGE