Added C++ constructor guards