Index: /trunk/FACT++/src/InterpreterV8.h
===================================================================
--- /trunk/FACT++/src/InterpreterV8.h	(revision 14635)
+++ /trunk/FACT++/src/InterpreterV8.h	(revision 14636)
@@ -27,6 +27,4 @@
     std::set<int> fThreadIds;
 
-    v8::Persistent<v8::Context> fGlobalContext;
-
     // A loookup table which allows to indentify the
     // the JavaScript object corrsponding to the
@@ -36,5 +34,5 @@
 
     // Lookup table for the callbacks in cases of state changes
-    std::map<std::string, v8::Persistent<v8::Value>>  fStateCallbacks;
+    std::map<std::string, v8::Persistent<v8::Object>> fStateCallbacks;
 
     // List of all timeout threads
@@ -46,6 +44,4 @@
     static v8::Handle<v8::FunctionTemplate> fTemplateLocal;
     static v8::Handle<v8::FunctionTemplate> fTemplateSky;
-    static v8::Handle<v8::FunctionTemplate> fTemplateMoon;
-    static v8::Handle<v8::FunctionTemplate> fTemplateDatabase;
 
 #ifdef HAVE_SQL
@@ -88,4 +84,5 @@
 
     static double GetDataMember(const v8::Arguments &args, const char *name);
+    static v8::Handle<v8::Value> Constructor(const v8::Arguments &args);
 
     static v8::Handle<v8::Value> LocalToString(const v8::Arguments &args);