Changes in order to supoport finite domain variables with the current official virtual machine.