Updated architecture form