Added some domain classes