Work on extra domain classes