Added hop support