Add enum domains, remove dm_pk and dm_order