Unify the columns and their order + optimization
Previous error due to column missmatch