Better import of contraints with missing references