Update of DS files to help support comments