Updated to work with protobuf 2.5