Updated data params to avoid ns clash