Moved to new C++ / enterprise style