Update domain id data type.
Add missing service categories.
Use service category code as identifier.