refactor: otp-1982: CRAM: Extend domain classes

Merged Andreas Kling requested to merge review/otp-1982 into master

Closes otp-1982

Merge request reports