Refactor backwards constraints