Address comments and use a hash entry with 2 hash fields