Make namespace option more flexible