Make data part optional as intended