Use OrderedMap.Entry for elements

- allows head, last to return key information