Update NOT IMPLEMENTED comments