Support multiple namespace; Optimize