Added jump location support