refactored ds to have orm