Add vcr support