BiMap reintroduced
Message and HelloMessage updated