diff --git a/src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java b/src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java
index 5d938d7c7b6e9d92dfb17ebb5e183bdae8311a71..faf1c9ff4ee896b615d390b7cc165658d9ac202a 100644
--- a/src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java
+++ b/src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java
@@ -81,25 +81,16 @@ public class MetricoOrchestrationService implements JavaDelegate {
 			String cfs_id = String.valueOf(serviceCharacteristic.getValue().getValue());
 			mcjFVO.setConsumingApplicationId(cfs_id);
 
-			serviceCharacteristic = aService.getServiceCharacteristicByName("_MT_END_TIME");
-			String endTimeString = 	String.valueOf(serviceCharacteristic.getValue().getValue());
 			ScheduleDefinitionFVO scheduleDefinition = new ScheduleDefinitionFVO();
-			if (endTimeString != null && !endTimeString.equals("")) {
-				OffsetDateTime endTime = convertStringToOffsetDateTime(endTimeString, DateTimeFormat.ISO.DATE_TIME );
-				scheduleDefinition.setScheduleDefinitionEndTime(endTime);
-			} else{
-				OffsetDateTime endTime = OffsetDateTime.now().plusHours(1);
-				scheduleDefinition.setScheduleDefinitionEndTime(endTime);
+			if(aService.getStartDate() != null) {
+				scheduleDefinition.setScheduleDefinitionStartTime(aService.getStartDate());
+			} else {
+				scheduleDefinition.setScheduleDefinitionStartTime(OffsetDateTime.now(ZoneOffset.UTC));
 			}
-
-			serviceCharacteristic = aService.getServiceCharacteristicByName("_MT_START_TIME");
-			String startTimeString = String.valueOf(serviceCharacteristic.getValue().getValue());
-			if (startTimeString != null&& !startTimeString.equals("")) {
-				OffsetDateTime startTime = convertStringToOffsetDateTime(startTimeString, DateTimeFormat.ISO.DATE_TIME );
-				scheduleDefinition.setScheduleDefinitionStartTime(startTime);
-			} else{
-				OffsetDateTime startTime = OffsetDateTime.now();
-				scheduleDefinition.setScheduleDefinitionStartTime(startTime);
+			if(aService.getEndDate() != null) {
+				scheduleDefinition.setScheduleDefinitionEndTime(aService.getEndDate());
+			} else {
+				scheduleDefinition.setScheduleDefinitionEndTime(OffsetDateTime.now(ZoneOffset.UTC).plusHours(1));
 			}
 			List<ScheduleDefinitionFVO> scheduleDefinitions = new ArrayList<>();
 			scheduleDefinitions.add(scheduleDefinition);