Fixed some of the architecture changes