Change namespace and add some minor changes