Added click and drag support