Preparations for implementing Dive constraint handling