Modified the structure of the data path.