Corrected a bug and improved RoutingEntry class