- re-enable hashmap usage (Ralf)