Minor improvement in the architecture.