Small architecture changes