diff --git a/Changelog b/Changelog
index 0b128a5b8c2b49810976e23bfaa738f0d7840d0a..2c33abac16e39de5e522df84a9ffdfc1beb65f5f 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+Travel::Status::DE::DeutscheBahn 6.04 - Sat Aug 10 2024
+
+    * hafas-m: Add -n / --num-results option
+    * HAFAS: Add BVG and VOS service definitions
+
 Travel::Status::DE::DeutscheBahn 6.03 - Mon Apr 15 2024
 
     * Journey: Add product_at accessor
diff --git a/bin/hafas-m b/bin/hafas-m
index 43ad1110303e75fa4ec98193d9f991be3bd200ef..6cdf96feb4feff713b6213bc64bd77498eec9ef2 100755
--- a/bin/hafas-m
+++ b/bin/hafas-m
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use 5.014;
 
-our $VERSION = '6.03';
+our $VERSION = '6.04';
 
 use utf8;
 use DateTime;
@@ -684,7 +684,7 @@ B<hafas-m> [B<-s> I<service>] [B<-l> I<language>] B<!>I<query>|I<journeyID>
 
 =head1 VERSION
 
-version 6.03
+version 6.04
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/DeutscheBahn.pm b/lib/Travel/Status/DE/DeutscheBahn.pm
index bdf961d7dda87a135eee91000916702f4b9cdff3..aa41ce3ebaf35e9ec81c8b1d588a9eeb87d3a9fd 100644
--- a/lib/Travel/Status/DE/DeutscheBahn.pm
+++ b/lib/Travel/Status/DE/DeutscheBahn.pm
@@ -6,7 +6,7 @@ use 5.014;
 
 use parent 'Travel::Status::DE::HAFAS';
 
-our $VERSION = '6.03';
+our $VERSION = '6.04';
 
 sub new {
 	my ( $class, %opt ) = @_;
@@ -49,7 +49,7 @@ monitor operated by Deutsche Bahn
 
 =head1 VERSION
 
-version 6.03
+version 6.04
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS.pm b/lib/Travel/Status/DE/HAFAS.pm
index 80fe740966ded721e572270b722a995b7cb69666..0abad7c3bf293e06b6caf52a690d87f11128ef96 100644
--- a/lib/Travel/Status/DE/HAFAS.pm
+++ b/lib/Travel/Status/DE/HAFAS.pm
@@ -21,7 +21,7 @@ use Travel::Status::DE::HAFAS::Polyline qw(decode_polyline);
 use Travel::Status::DE::HAFAS::Product;
 use Travel::Status::DE::HAFAS::StopFinder;
 
-our $VERSION = '6.03';
+our $VERSION = '6.04';
 
 # {{{ Endpoint Definition
 
@@ -1269,7 +1269,7 @@ monitors
 
 =head1 VERSION
 
-version 6.03
+version 6.04
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS/Journey.pm b/lib/Travel/Status/DE/HAFAS/Journey.pm
index 07325e50ced757961c234888a8c01e18d511debb..756e193a0f33913ad42655081fccfd90adc116d0 100644
--- a/lib/Travel/Status/DE/HAFAS/Journey.pm
+++ b/lib/Travel/Status/DE/HAFAS/Journey.pm
@@ -11,7 +11,7 @@ use DateTime::Format::Strptime;
 use List::Util qw(any uniq);
 use Travel::Status::DE::HAFAS::Stop;
 
-our $VERSION = '6.03';
+our $VERSION = '6.04';
 
 Travel::Status::DE::HAFAS::Journey->mk_ro_accessors(
 	qw(datetime sched_datetime rt_datetime tz_offset
@@ -226,7 +226,7 @@ sub new {
 			my $load = $tco_kv->{rRT} // $tco_kv->{r};
 
 			# BVG uses 11 .. 13 rather than 1 .. 4
-			if ( $load > 10 ) {
+			if ( defined $load and $load > 10 ) {
 				$load -= 10;
 			}
 
@@ -437,7 +437,7 @@ journey received by Travel::Status::DE::HAFAS
 
 =head1 VERSION
 
-version 6.03
+version 6.04
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS/Location.pm b/lib/Travel/Status/DE/HAFAS/Location.pm
index fd25634b442621859adbe6aaeef3342c6a68821b..5ccb947093037ea49936f78bde83ac18d9f766a4 100644
--- a/lib/Travel/Status/DE/HAFAS/Location.pm
+++ b/lib/Travel/Status/DE/HAFAS/Location.pm
@@ -6,7 +6,7 @@ use 5.014;
 
 use parent 'Class::Accessor';
 
-our $VERSION = '6.03';
+our $VERSION = '6.04';
 
 Travel::Status::DE::HAFAS::Location->mk_ro_accessors(
 	qw(lid type name eva state lat lon distance_m weight));
@@ -57,7 +57,7 @@ Travel::Status::DE::HAFAS::Location - A single public transit location
 
 =head1 VERSION
 
-version 6.03
+version 6.04
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS/Message.pm b/lib/Travel/Status/DE/HAFAS/Message.pm
index ae2fa711254c78a20f0973a13ccc5b7323659d33..af3d258c6499ad98597d23ac2d8ad3a71a02ef2a 100644
--- a/lib/Travel/Status/DE/HAFAS/Message.pm
+++ b/lib/Travel/Status/DE/HAFAS/Message.pm
@@ -6,7 +6,7 @@ use 5.014;
 
 use parent 'Class::Accessor';
 
-our $VERSION = '6.03';
+our $VERSION = '6.04';
 
 Travel::Status::DE::HAFAS::Message->mk_ro_accessors(
 	qw(short type text code prio is_him ref_count));
@@ -69,7 +69,7 @@ Travel::Status::DE::HAFAS::Message - An arrival/departure-related message.
 
 =head1 VERSION
 
-version 6.03
+version 6.04
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS/Polyline.pm b/lib/Travel/Status/DE/HAFAS/Polyline.pm
index d07844b75537b88cceb3f9f0983ff188c415aba0..9921bd1cbeb0d0d14f4885a7ca6187705b28a6b0 100644
--- a/lib/Travel/Status/DE/HAFAS/Polyline.pm
+++ b/lib/Travel/Status/DE/HAFAS/Polyline.pm
@@ -16,7 +16,7 @@ use 5.014;
 use parent 'Exporter';
 our @EXPORT_OK = qw(decode_polyline);
 
-our $VERSION = '6.03';
+our $VERSION = '6.04';
 
 # Translated this php script
 # <http://unitstep.net/blog/2008/08/02/decoding-google-maps-encoded-polylines-using-php/>
diff --git a/lib/Travel/Status/DE/HAFAS/Product.pm b/lib/Travel/Status/DE/HAFAS/Product.pm
index cd85c164757e3dd62de7ad9185ced0ce2bd295ce..270a173f738c418aafd501f5d864fdb392f86f87 100644
--- a/lib/Travel/Status/DE/HAFAS/Product.pm
+++ b/lib/Travel/Status/DE/HAFAS/Product.pm
@@ -8,7 +8,7 @@ use 5.014;
 
 use parent 'Class::Accessor';
 
-our $VERSION = '6.03';
+our $VERSION = '6.04';
 
 Travel::Status::DE::HAFAS::Product->mk_ro_accessors(
 	qw(class line_id line_no name number type type_long operator));
@@ -105,7 +105,7 @@ associated with a journey.
 
 =head1 VERSION
 
-version 6.03
+version 6.04
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS/Stop.pm b/lib/Travel/Status/DE/HAFAS/Stop.pm
index 75560ded6983c98806c4514a482cb13f91304673..90eccce52f50614506400fe6e3dcdb0ad7cba2dd 100644
--- a/lib/Travel/Status/DE/HAFAS/Stop.pm
+++ b/lib/Travel/Status/DE/HAFAS/Stop.pm
@@ -8,7 +8,7 @@ use 5.014;
 
 use parent 'Class::Accessor';
 
-our $VERSION = '6.03';
+our $VERSION = '6.04';
 
 Travel::Status::DE::HAFAS::Stop->mk_ro_accessors(
 	qw(loc
@@ -140,7 +140,7 @@ sub new {
 		my $load = $tco_kv->{rRT} // $tco_kv->{r};
 
 		# BVG uses 11 .. 13 rather than 1 .. 4
-		if ( $load > 10 ) {
+		if ( defined $load and $load > 10 ) {
 			$load -= 10;
 		}
 
@@ -227,7 +227,7 @@ Travel::Status::DE::HAFAS::Stop - Information about a HAFAS stop.
 
 =head1 VERSION
 
-version 6.03
+version 6.04
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS/StopFinder.pm b/lib/Travel/Status/DE/HAFAS/StopFinder.pm
index 10f48da137c24e3550d1612873c2a32a1262755e..8af7485c47137bae570530bc5f00e861e2837fd9 100644
--- a/lib/Travel/Status/DE/HAFAS/StopFinder.pm
+++ b/lib/Travel/Status/DE/HAFAS/StopFinder.pm
@@ -10,7 +10,7 @@ use Encode qw(decode);
 use JSON;
 use LWP::UserAgent;
 
-our $VERSION = '6.03';
+our $VERSION = '6.04';
 
 # {{{ Constructors
 
@@ -180,7 +180,7 @@ finder services
 
 =head1 VERSION
 
-version 6.03
+version 6.04
 
 =head1 DESCRIPTION