Some architecture improvements