diff --git a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/ILocalResource.java b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/ILocalResource.java
index d387a4a..62be750 100644
--- a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/ILocalResource.java
+++ b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/ILocalResource.java
@@ -17,8 +17,6 @@
 import java.io.Serializable;
 
 public interface ILocalResource extends Serializable {
-    public byte[] toBytes();
-
     public long getResourceId();
 
     public String getResourceName();
diff --git a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/ILocalResourceClass.java b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/ILocalResourceClass.java
index ea7fcbd..8aed21f 100644
--- a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/ILocalResourceClass.java
+++ b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/ILocalResourceClass.java
@@ -20,9 +20,9 @@
     public static final int LSMRTree = 1;
     public static final int LSMInvertedIndex = 2;
 
-    public ILocalResource deserialize(byte[] bytes);
+    public byte[] serialize(ILocalResource resource);
     
-    public byte[] serialize(ILocalResource localResource);
+    public ILocalResource deserialize(byte[] bytes);
     
     public int getResourceClassId();
     
diff --git a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/LSMBTreeLocalResource.java b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/LSMBTreeLocalResource.java
index 40b6bf4..27a021d 100644
--- a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/LSMBTreeLocalResource.java
+++ b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/LSMBTreeLocalResource.java
@@ -1,35 +1,38 @@
 package edu.uci.ics.hyracks.storage.common.file;
 
 public class LSMBTreeLocalResource implements ILocalResource {
+    private static final long serialVersionUID = -8638308062094620884L;
+    private final long resourceId;
+    private final String resourceName;
+    private final Object object;
+    private final LSMBTreeLocalResourceClass resourceClass;
 
-    @Override
-    public byte[] toBytes() {
-        // TODO Auto-generated method stub
-        return null;
+    public LSMBTreeLocalResource(long resourceId, String resourceName, Object object,
+            LSMBTreeLocalResourceClass resourceClass) {
+        this.resourceId = resourceId;
+        this.resourceName = resourceName;
+        this.object = object;
+        this.resourceClass = resourceClass;
     }
 
     @Override
     public long getResourceId() {
-        // TODO Auto-generated method stub
-        return 0;
+        return resourceId;
     }
 
     @Override
     public String getResourceName() {
-        // TODO Auto-generated method stub
-        return null;
+        return resourceName;
     }
 
     @Override
     public Object getResourceObject() {
-        // TODO Auto-generated method stub
-        return null;
+        return object;
     }
 
     @Override
     public ILocalResourceClass getResourceClass() {
-        // TODO Auto-generated method stub
-        return null;
+        return resourceClass;
     }
 
 }
diff --git a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/LSMBTreeLocalResourceClass.java b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/LSMBTreeLocalResourceClass.java
index 1d9913c..7a73327 100644
--- a/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/LSMBTreeLocalResourceClass.java
+++ b/hyracks-storage-common/src/main/java/edu/uci/ics/hyracks/storage/common/file/LSMBTreeLocalResourceClass.java
@@ -3,13 +3,13 @@
 public class LSMBTreeLocalResourceClass implements ILocalResourceClass {
 
     @Override
-    public ILocalResource deserialize(byte[] bytes) {
+    public byte[] serialize(ILocalResource resource) {
         // TODO Auto-generated method stub
         return null;
     }
-
+    
     @Override
-    public byte[] serialize(ILocalResource localResource) {
+    public ILocalResource deserialize(byte[] bytes) {
         // TODO Auto-generated method stub
         return null;
     }
