fixed domain classes (again ^^)