diff --git a/pyext/ctcubemask.i b/pyext/ctcubemask.i
index 2d87e68..5abf661 100644
--- a/pyext/ctcubemask.i
+++ b/pyext/ctcubemask.i
@@ -1,5 +1,5 @@
 /***************************************************************************
- *                    ctcubemask - CTA mask cube tool                      *
+ *                      ctcubemask - Cube filter tool                      *
  * ----------------------------------------------------------------------- *
  *  copyright (C) 2014 Chia-Chun Lu                                        *
  * ----------------------------------------------------------------------- *
@@ -20,22 +20,21 @@
  ***************************************************************************/
 /**
  * @file ctcubemask.i
- * @brief CTA mask cube interface definition
+ * @brief Cube filter tool definition
  * @author Chia-Chun Lu
  */
 %{
 /* Put headers and other declarations here that are needed for compilation */
 #include "ctcubemask.hpp"
-#include "GTools.hpp"
 %}
 
 
 /***********************************************************************//**
  * @class ctcubemask
  *
- * @brief CTA data selection tool Python interface
+ * @brief Cube filter tool
  ***************************************************************************/
-class ctcubemask : public GApplication  {
+class ctcubemask : public ctool {
 public:
     // Constructors and destructors
     ctcubemask(void);
@@ -54,7 +53,7 @@ public:
 
 
 /***********************************************************************//**
- * @brief CTA data selection tool Python extension
+ * @brief Cube filter tool Python extension
  ***************************************************************************/
 %extend ctcubemask {
     ctcubemask copy() {
diff --git a/src/ctcubemask/Makefile.am b/src/ctcubemask/Makefile.am
index 53b9bff..8d1c440 100644
--- a/src/ctcubemask/Makefile.am
+++ b/src/ctcubemask/Makefile.am
@@ -1,5 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
+# Set include directories
+INCLUDES = -I$(top_srcdir)/src/support
+
 # Program name
 bin_PROGRAMS = ctcubemask
 
@@ -14,7 +17,7 @@ libctcubemask_la_SOURCES = $(sources)
 ctcubemask_SOURCES = main.cpp
 ctcubemask_LDFLAGS = $(LIB_LINK_OPTION) @LDFLAGS@
 ctcubemask_CPPFLAGS = @CPPFLAGS@
-ctcubemask_LDADD = libctcubemask.la
+ctcubemask_LDADD = libctcubemask.la $(top_srcdir)/src/support/libsupport.la
 
 # Parameter files
 pfilesdir = $(prefix)/syspfiles
diff --git a/src/ctcubemask/ctcubemask.cpp b/src/ctcubemask/ctcubemask.cpp
index 3638f57..d4a9348 100644
--- a/src/ctcubemask/ctcubemask.cpp
+++ b/src/ctcubemask/ctcubemask.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *                    ctcubemask - CTA cube filter tool                    *
+ *                      ctcubemask - Cube filter tool                      *
  * ----------------------------------------------------------------------- *
  *  copyright (C) 2014 by Chia-Chun Lu                                     *
  * ----------------------------------------------------------------------- *
@@ -20,7 +20,7 @@
  ***************************************************************************/
 /**
  * @file ctcubemask.cpp
- * @brief CTA mask cube implementation
+ * @brief Cube filter tool implementation
  * @author Chia-Chun Lu
  */
 
@@ -51,14 +51,11 @@
 /***********************************************************************//**
  * @brief Void constructor
  ***************************************************************************/
-ctcubemask::ctcubemask(void) : GApplication(CTCUBEMASK_NAME, CTCUBEMASK_VERSION)
+ctcubemask::ctcubemask(void) : ctool(CTCUBEMASK_NAME, CTCUBEMASK_VERSION)
 {
     // Initialise members
     init_members();
 
-    // Write header into logger
-    log_header();
-
     // Return
     return;
 }
@@ -73,7 +70,7 @@ ctcubemask::ctcubemask(void) : GApplication(CTCUBEMASK_NAME, CTCUBEMASK_VERSION)
  * an observation container.
  ***************************************************************************/
 ctcubemask::ctcubemask(const GObservations& obs) :
-            GApplication(CTCUBEMASK_NAME, CTCUBEMASK_VERSION)
+            ctool(CTCUBEMASK_NAME, CTCUBEMASK_VERSION)
 {
     // Initialise members
     init_members();
@@ -81,9 +78,6 @@ ctcubemask::ctcubemask(const GObservations& obs) :
     // Set observations
     m_obs = obs;
 
-    // Write header into logger
-    log_header();
-
     // Return
     return;
 }
@@ -98,14 +92,11 @@ ctcubemask::ctcubemask(const GObservations& obs) :
  * @param[in] argv Array of command line arguments.
  ***************************************************************************/
 ctcubemask::ctcubemask(int argc, char *argv[]) : 
-            GApplication(CTCUBEMASK_NAME, CTCUBEMASK_VERSION, argc, argv)
+            ctool(CTCUBEMASK_NAME, CTCUBEMASK_VERSION, argc, argv)
 {
     // Initialise members
     init_members();
 
-    // Write header into logger
-    log_header();
-
     // Return
     return;
 }
@@ -116,7 +107,7 @@ ctcubemask::ctcubemask(int argc, char *argv[]) :
  *
  * @param[in] app Application.
  ***************************************************************************/
-ctcubemask::ctcubemask(const ctcubemask& app) : GApplication(app)
+ctcubemask::ctcubemask(const ctcubemask& app) : ctool(app)
 {
     // Initialise members
     init_members();
@@ -159,7 +150,7 @@ ctcubemask& ctcubemask::operator=(const ctcubemask& app)
     if (this != &app) {
 
         // Copy base class members
-        this->GApplication::operator=(app);
+        this->ctool::operator=(app);
 
         // Free members
         free_members();
@@ -190,10 +181,12 @@ void ctcubemask::clear(void)
 {
     // Free members
     free_members();
+    this->ctool::free_members();
     this->GApplication::free_members();
 
     // Initialise members
     this->GApplication::init_members();
+    this->ctool::init_members();
     init_members();
 
     // Return
diff --git a/src/ctcubemask/ctcubemask.hpp b/src/ctcubemask/ctcubemask.hpp
index a6d725b..30a11f8 100644
--- a/src/ctcubemask/ctcubemask.hpp
+++ b/src/ctcubemask/ctcubemask.hpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *                    ctcubemask - CTA cube filter tool                    *
+ *                      ctcubemask - Cube filter tool                      *
  * ----------------------------------------------------------------------- *
  *  copyright (C) 2014 by Chia-Chun Lu                                     *
  * ----------------------------------------------------------------------- *
@@ -20,7 +20,7 @@
  ***************************************************************************/
 /**
  * @file ctcubemask.hpp
- * @brief CTA mask cube tool definition
+ * @brief Cube filter tool definition
  * @author Chia-Chun Lu
  */
 
@@ -32,6 +32,7 @@
 #include <string>
 #include "GammaLib.hpp"
 #include "GCTALib.hpp"
+#include "ctool.hpp"
 
 /* __Definitions _________________________________________________________ */
 #define CTCUBEMASK_NAME    "ctcubemask"
@@ -41,9 +42,10 @@
 /***********************************************************************//**
  * @class ctcubemask
  *
- * @brief CTA mask cube tool interface defintion.
+ * @brief Cube filter tool
  ***************************************************************************/
-class ctcubemask : public GApplication  {
+class ctcubemask : public ctool {
+
 public:
     // Constructors and destructors
     ctcubemask(void);