Integrated the full list of types