added constructor / destructor support