Adjust to new repex variables features