Adding support for custom vars