Add nd-data schema support