Added more architecture stuff