wip more compat with hashmap