Updated flow/class diagrams