Registries now handled by datatable

Registries now handled by datatable
@fangstar