Add classes according to class diagram