Remove type match criterion - compile with older version of protobuf
Added TODO