Changer buffer to vector for diversify and Fix/Add NXP Diversification