Added structure based on flowchart