Add hashmap to implementation