Refactoring for multi VIP usage...