Add DSON support