changed some domain classes and added a little functionality