Enhanced constraints flow