Added steps to convert key/value pairs to/from Map