Add v500 to the mix

Change-Id: I3da63702a5218782c849febfd31ef45f31c2df19