Correctly implemented the map datatype for use in the proxy