Made some changes to the architecture.