Added drag handling