add namestorage handling