Added the domain classes in.