Better handle of cas namespace