updated class diagram according the changes introduced by issue #9