Follow-up to use DataTypeRegistry in core

Change-Id: Ib64cb57e07650e3d249356cc59ca18af8c390c36