Imporving heap.
Updating class diagram.