Updated internal Draggable Implementation