Updated handles with dropzones