Trivial architecture change