Added ds function and removed old unused aliases