Updated class diagram
Applied changes to logic according to class diagram