updated with namespace option