Added Python and CPP support