diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 8b83ce1cc91220505da93b035638aa8864b50bb6..5e50866492528d40e37cf126f55949cd7db97b28 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1884,11 +1884,11 @@ module OneM2M_Functions {
 				
 				/**
 				 * @desc Handling of announcement of resources
-				 * @param p_from Expected originator of the request primitive
-				 * @param p_to Expected receiver of the request primitive
+				 * @param p_requestPrimitive Expected announcement primitive
+				 * @param p_responseStatusCode Response Status code to be sent as response
+				 * @param p_expectedResourceIndex Expected target parent resource of the announcemnet
 				 * @verdict 
 				 */
-				 //TODO To finalize this function
 				function f_cse_announcementProcedure_createHandler(template RequestPrimitive p_requestprimitive := ?, in ResponseStatusCode p_responseStatusCode := int2001, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu {
 					// Local variables
 					var MsgIn v_request;
@@ -1904,8 +1904,8 @@ module OneM2M_Functions {
 					alt {
 						[] mccPortIn.receive(mw_request(p_requestprimitive)) -> value v_request {
 							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
-							//TODO Save resource and generate required attributes
+							setverdict(pass, __SCOPE__ & ":INFO: Expected Announcement received");
+							//Save resource and generate required attributes
 							v_announcedResource:= f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex,v_request.primitive.requestPrimitive.resourceType);
 							v_announcedResourceIndex := f_setLocalResource(v_announcedResource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);