* BAEL-397: use toMap instead of creating an empty hashmap * BAEL-397: static import toMap for cleaner code