Work on domain classes