Resolve namespace issue