Modified the architecture