Add columns spanning. Refactor table storage