#NO_ISSUE Constraints refactoring