Adding the plusplus feature