diff --git a/cstore.h b/cstore.h
index 87b552bbf..9a1764972 100644
--- a/cstore.h
+++ b/cstore.h
@@ -252,8 +252,6 @@ typedef struct TableWriteState
 extern CompressionType ParseCompressionType(const char *compressionTypeString);
 extern void InitializeCStoreTableFile(Oid relationId, Relation relation,
 									  CStoreOptions *cstoreOptions);
-extern void CreateCStoreDatabaseDirectory(Oid databaseOid);
-extern void RemoveCStoreDatabaseDirectory(Oid databaseOid);
 
 /* Function declarations for writing to a cstore file */
 extern TableWriteState * CStoreBeginWrite(Oid relationId,
diff --git a/cstore_tableam.c b/cstore_tableam.c
index d67ac10b6..f93971c59 100644
--- a/cstore_tableam.c
+++ b/cstore_tableam.c
@@ -31,8 +31,8 @@
 #include "utils/builtins.h"
 #include "utils/rel.h"
 
+#include "cstore.h"
 #include "cstore_tableam.h"
-#include "cstore_fdw.h"
 
 typedef struct CStoreScanDescData
 {
@@ -44,6 +44,16 @@ typedef struct CStoreScanDescData *CStoreScanDesc;
 
 static TableWriteState *CStoreWriteState = NULL;
 
+static CStoreOptions *
+CStoreGetDefaultOptions(void)
+{
+	CStoreOptions *cstoreOptions = palloc0(sizeof(CStoreOptions));
+	cstoreOptions->compressionType = DEFAULT_COMPRESSION_TYPE;
+	cstoreOptions->stripeRowCount = DEFAULT_STRIPE_ROW_COUNT;
+	cstoreOptions->blockRowCount = DEFAULT_BLOCK_ROW_COUNT;
+	return cstoreOptions;
+}
+
 static void
 cstore_init_write_state(Relation relation)
 {
@@ -58,14 +68,14 @@ cstore_init_write_state(Relation relation)
 
 	if (CStoreWriteState == NULL)
 	{
-		CStoreFdwOptions *cstoreFdwOptions = CStoreGetOptions(relation->rd_id);
+		CStoreOptions *cstoreOptions = CStoreGetDefaultOptions();
 		TupleDesc tupdesc = RelationGetDescr(relation);
 
 		elog(NOTICE, "initializing write state for relation %d", relation->rd_id);
-		CStoreWriteState = CStoreBeginWrite(cstoreFdwOptions->filename,
-											cstoreFdwOptions->compressionType,
-											cstoreFdwOptions->stripeRowCount,
-											cstoreFdwOptions->blockRowCount,
+		CStoreWriteState = CStoreBeginWrite(relation->rd_id,
+											cstoreOptions->compressionType,
+											cstoreOptions->stripeRowCount,
+											cstoreOptions->blockRowCount,
 											tupdesc);
 
 		CStoreWriteState->relation = relation;
@@ -95,13 +105,14 @@ cstore_beginscan(Relation relation, Snapshot snapshot,
 				 ParallelTableScanDesc parallel_scan,
 				 uint32 flags)
 {
-	TupleDesc tupdesc = relation->rd_att;
-	CStoreFdwOptions *cstoreFdwOptions = NULL;
-	TableReadState *readState = NULL;
-	CStoreScanDesc scan = palloc(sizeof(CStoreScanDescData));
-	List *columnList = NIL;
+	Oid				 relid		   = relation->rd_id;
+	TupleDesc		 tupdesc	   = relation->rd_att;
+	CStoreOptions	*cstoreOptions = NULL;
+	TableReadState	*readState	   = NULL;
+	CStoreScanDesc	 scan		   = palloc(sizeof(CStoreScanDescData));
+	List			*columnList	   = NIL;
 
-	cstoreFdwOptions = CStoreGetOptions(relation->rd_id);
+	cstoreOptions = CStoreGetDefaultOptions();
 
 	scan->cs_base.rs_rd = relation;
 	scan->cs_base.rs_snapshot = snapshot;
@@ -124,8 +135,8 @@ cstore_beginscan(Relation relation, Snapshot snapshot,
 		columnList = lappend(columnList, var);
 	}
 	
-	readState = CStoreBeginRead(cstoreFdwOptions->filename, tupdesc,
-								columnList, NULL);
+	readState = CStoreBeginRead(relid, tupdesc, columnList, NULL);
+	readState->relation = relation;
 
 	scan->cs_readState = readState;
 
@@ -258,7 +269,7 @@ cstore_tuple_insert(Relation relation, TupleTableSlot *slot, CommandId cid,
 
 	cstore_init_write_state(relation);
 
-	heapTuple = GetSlotHeapTuple(slot);
+	heapTuple = ExecCopySlotHeapTuple(slot);
 	if (HeapTupleHasExternal(heapTuple))
 	{
 		/* detoast any toasted attributes */
@@ -297,7 +308,7 @@ cstore_multi_insert(Relation relation, TupleTableSlot **slots, int ntuples,
 	for (int i = 0; i < ntuples; i++)
 	{
 		TupleTableSlot *tupleSlot = slots[i];
-		HeapTuple heapTuple = GetSlotHeapTuple(tupleSlot);
+		HeapTuple heapTuple = ExecCopySlotHeapTuple(tupleSlot);
 
 		if (HeapTupleHasExternal(heapTuple))
 		{
@@ -363,8 +374,7 @@ cstore_relation_set_new_filenode(Relation rel,
 	*freezeXid = RecentXmin;
 	*minmulti = GetOldestMultiXactId();
 	srel = RelationCreateStorage(*newrnode, persistence);
-	CreateCStoreDatabaseDirectory(MyDatabaseId);
-	InitializeCStoreTableFile(rel->rd_id, rel);
+	InitializeCStoreTableFile(rel->rd_id, rel, CStoreGetDefaultOptions());
 	smgrclose(srel);
 }
 
diff --git a/cstore_tableam.h b/cstore_tableam.h
index 67dbe0d87..f81c13155 100644
--- a/cstore_tableam.h
+++ b/cstore_tableam.h
@@ -4,3 +4,4 @@
 
 const TableAmRoutine *GetCstoreTableAmRoutine(void);
 Datum cstore_tableam_handler(PG_FUNCTION_ARGS);
+extern void cstore_free_write_state(void);