Text changes and incorporating ODP Type