Added better management for draggable objects