[VP, TP] refactored contacts