Adding columns and better design.