Design

New class diagram