Added draggable controls support