Commit to resolve namespace issues