CPP support added