--- a/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/StructuredData.java	Fri Dec 11 15:20:27 2015 +0100
+++ b/truffle/com.oracle.truffle.tck/src/com/oracle/truffle/tck/StructuredData.java	Mon Dec 14 14:20:08 2015 +0100
@@ -24,8 +24,6 @@
  */
 package com.oracle.truffle.tck;
 
-import java.util.Map;
-
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -35,20 +33,16 @@
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.nodes.RootNode;
 
-public final class StructuredData implements TruffleObject {
+final class StructuredData implements TruffleObject {
 
     private final byte[] buffer;
     private final Schema schema;
 
-    public StructuredData(byte[] buffer, Schema schema) {
+    StructuredData(byte[] buffer, Schema schema) {
         this.buffer = buffer;
         this.schema = schema;
     }
 
-    public Map<String, Object> getEntry(int index) {
-        return schema.getEntry(buffer, index);
-    }
-
     public ForeignAccess getForeignAccess() {
         return ForeignAccess.create(new StructuredDataForeignAccessFactory());
     }
@@ -88,7 +82,7 @@
         public Object execute(VirtualFrame frame) {
             StructuredData data = (StructuredData) ForeignAccess.getReceiver(frame);
             Number index = (Number) ForeignAccess.getArguments(frame).get(0);
-            return new MapTruffleObject(data.getEntry(index.intValue()));
+            return new StructuredDataEntry(data.buffer, data.schema, index.intValue());
         }
 
     }