Modified domain classes