Reintegrate the cost constraints. Too costly for the moment for big problems but it won't be a big deal to improve this