@@ -118,12 +118,11 @@
 
 - (void)dealloc
 {
 	[_URL release];
 	[_headers release];
-	[_POSTData release];
-	[_MIMEType release];
+	[_entity release];
 	[_remoteAddress release];
 
 	[super dealloc];
 }
 
@@ -134,12 +133,11 @@
 	@try {
 		copy->_method = _method;
 		copy->_protocolVersion = _protocolVersion;
 		[copy setURL: _URL];
 		[copy setHeaders: _headers];
-		[copy setPOSTData: _POSTData];
-		[copy setMIMEType: _MIMEType];
+		[copy setEntity: _entity];
 		[copy setRemoteAddress: _remoteAddress];
 	} @catch (id e) {
 		[copy release];
 		@throw e;
 	}
@@ -159,12 +157,11 @@
 	if (request->_method != _method ||
 	    request->_protocolVersion.major != _protocolVersion.major ||
 	    request->_protocolVersion.minor != _protocolVersion.minor ||
 	    ![request->_URL isEqual: _URL] ||
 	    ![request->_headers isEqual: _headers] ||
-	    ![request->_POSTData isEqual: _POSTData] ||
-	    ![request->_MIMEType isEqual: _MIMEType] ||
+	    ![request->_entity isEqual: _entity] ||
 	    ![request->_remoteAddress isEqual: _remoteAddress])
 		return false;
 
 	return true;
 }
@@ -178,12 +175,11 @@
 	OF_HASH_ADD(hash, _method);
 	OF_HASH_ADD(hash, _protocolVersion.major);
 	OF_HASH_ADD(hash, _protocolVersion.minor);
 	OF_HASH_ADD_HASH(hash, [_URL hash]);
 	OF_HASH_ADD_HASH(hash, [_headers hash]);
-	OF_HASH_ADD_HASH(hash, [_POSTData hash]);
-	OF_HASH_ADD_HASH(hash, [_MIMEType hash]);
+	OF_HASH_ADD_HASH(hash, [_entity hash]);
 	OF_HASH_ADD_HASH(hash, [_remoteAddress hash]);
 
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
@@ -263,28 +259,18 @@
 - (OFDictionary*)headers
 {
 	OF_GETTER(_headers, true)
 }
 
-- (void)setPOSTData: (OFDataArray*)POSTData
-{
-	OF_SETTER(_POSTData, POSTData, true, 0)
-}
-
-- (OFDataArray*)POSTData
-{
-	OF_GETTER(_POSTData, true)
-}
-
-- (void)setMIMEType: (OFString*)MIMEType
-{
-	OF_SETTER(_MIMEType, MIMEType, true, 1)
-}
-
-- (OFString*)MIMEType
-{
-	OF_GETTER(_MIMEType, true)
+- (void)setEntity: (OFDataArray*)entity
+{
+	OF_SETTER(_entity, entity, true, 0)
+}
+
+- (OFDataArray*)entity
+{
+	OF_GETTER(_entity, true)
 }
 
 - (void)setRemoteAddress: (OFString*)remoteAddress
 {
 	OF_SETTER(_remoteAddress, remoteAddress, true, 1)
@@ -297,30 +283,29 @@
 
 - (OFString*)description
 {
 	void *pool = objc_autoreleasePoolPush();
 	const char *method = of_http_request_method_to_string(_method);
-	OFString *indentedHeaders, *indentedPOSTData, *ret;
+	OFString *indentedHeaders, *indentedEntity, *ret;
 
 	indentedHeaders = [[_headers description]
 	    stringByReplacingOccurrencesOfString: @"\n"
 				      withString: @"\n\t"];
-	indentedPOSTData = [[_POSTData description]
+	indentedEntity = [[_entity description]
 	    stringByReplacingOccurrencesOfString: @"\n"
 				      withString: @"\n\t"];
 
 	ret = [[OFString alloc] initWithFormat:
 	    @"<%@:\n\tURL = %@\n"
 	    @"\tMethod = %s\n"
 	    @"\tHeaders = %@\n"
-	    @"\tPOST data = %@\n"
-	    @"\tPOST data MIME type = %@\n"
+	    @"\tEntity = %@\n"
 	    @"\tRemote address = %@\n"
 	    @">",
-	    [self class], _URL, method, indentedHeaders, indentedPOSTData,
-	    _MIMEType, _remoteAddress];
+	    [self class], _URL, method, indentedHeaders, indentedEntity,
+	    _remoteAddress];
 
 	objc_autoreleasePoolPop(pool);
 
 	return [ret autorelease];
 }
 @end