removed subclass, using namespace instead