Adding support for virtuals