Add support for hop limit