Further work on class diagram. Still basing on domain