Added Leash support