Add singleton base class