Update enhanced tables

Updated enhanced table for 3.1