Updated glpk model generation