Support old namespace