Removed the case statement for storage formats