New class diagram

It looks right to me. Can you look over it?