[PATCH] Implement TP-VPF-ENHANCED