Added defined_types