Minor changes, remove storage and use table instead