Store namespace as well