update for 4.3 #2: Add in device specific trees