Update Diagram and some behavior.

Signed-off-by: Rikard Johansson <rillee.johansson@gmail.com>