Rework virtual table