Class diagram improved but not yet ready