Made it Cpp better compatibility