Improve virtuals support