diff --git a/cdrs/fscdr.go b/cdrs/fscdr.go
index 28c894834..145631ec6 100644
--- a/cdrs/fscdr.go
+++ b/cdrs/fscdr.go
@@ -25,6 +25,7 @@ import (
 	"github.com/cgrates/cgrates/utils"
 	"strconv"
 	"time"
+	"strings"
 )
 
 const (
@@ -165,5 +166,89 @@ func (fsCdr FSCdr) AsRatedCdr(runId, reqTypeFld, directionFld, tenantFld, torFld
 	if utils.IsSliceMember([]string{runId, reqTypeFld, directionFld, tenantFld, torFld, accountFld, subjectFld, destFld, answerTimeFld, durationFld}, "") {
 		return nil, errors.New(fmt.Sprintf("%s:FieldName", utils.ERR_MANDATORY_IE_MISSING)) // All input field names are mandatory
 	}
-	return nil, nil
+	var err error
+	var hasKey bool
+	var aTimeStr, durStr string
+	rtCdr := new(utils.RatedCDR)
+	rtCdr.MediationRunId = runId
+	rtCdr.Cost = -1.0 // Default for non-rated CDR
+	if rtCdr.AccId = fsCdr.GetAccId(); len(rtCdr.AccId)==0 {
+		if fieldsMandatory {
+			return nil, errors.New(fmt.Sprintf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, utils.ACCID))
+		} else { // Not mandatory, need to generate here CgrId
+			rtCdr.CgrId = utils.GenUUID()
+		}
+	} else { // hasKey, use it to generate cgrid
+		rtCdr.CgrId = utils.FSCgrId(rtCdr.AccId)
+	}
+	if rtCdr.CdrHost = fsCdr.GetCdrHost(); len(rtCdr.CdrHost)==0 && fieldsMandatory {
+		return nil, errors.New(fmt.Sprintf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, utils.CDRHOST))
+	}
+	if rtCdr.CdrSource = fsCdr.GetCdrSource(); len(rtCdr.CdrSource)==0 && fieldsMandatory {
+		return nil, errors.New(fmt.Sprintf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, utils.CDRSOURCE))
+	}
+	if strings.HasPrefix(reqTypeFld, utils.STATIC_VALUE_PREFIX) { // Values starting with prefix are not dynamically populated
+		rtCdr.ReqType = reqTypeFld[1:]
+	} else if rtCdr.ReqType, hasKey = fsCdr[reqTypeFld]; !hasKey && fieldsMandatory {
+		return nil, errors.New(fmt.Sprintf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, reqTypeFld))
+	}
+	if strings.HasPrefix(directionFld, utils.STATIC_VALUE_PREFIX) {
+		rtCdr.Direction = directionFld[1:]
+	} else if rtCdr.Direction, hasKey = fsCdr[directionFld]; !hasKey && fieldsMandatory {
+		return nil, errors.New(fmt.Sprintf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, directionFld))
+	}
+	if strings.HasPrefix(tenantFld, utils.STATIC_VALUE_PREFIX) {
+		rtCdr.Tenant = tenantFld[1:]
+	} else if rtCdr.Tenant, hasKey = fsCdr[tenantFld]; !hasKey && fieldsMandatory {
+		return nil, errors.New(fmt.Sprintf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, tenantFld))
+	}
+	if strings.HasPrefix(torFld, utils.STATIC_VALUE_PREFIX) {
+		rtCdr.TOR = torFld[1:]
+	} else if rtCdr.TOR, hasKey = fsCdr[torFld]; !hasKey && fieldsMandatory {
+		return nil, errors.New(fmt.Sprintf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, torFld))
+	}
+	if strings.HasPrefix(accountFld, utils.STATIC_VALUE_PREFIX) {
+		rtCdr.Account = accountFld[1:]
+	} else if rtCdr.Account, hasKey = fsCdr[accountFld]; !hasKey && fieldsMandatory {
+		return nil, errors.New(fmt.Sprintf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, accountFld))
+	}
+	if strings.HasPrefix(subjectFld, utils.STATIC_VALUE_PREFIX) {
+		rtCdr.Subject = subjectFld[1:]
+	} else if rtCdr.Subject, hasKey = fsCdr[subjectFld]; !hasKey && fieldsMandatory {
+		return nil, errors.New(fmt.Sprintf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, subjectFld))
+	}
+	if strings.HasPrefix(destFld, utils.STATIC_VALUE_PREFIX) {
+		rtCdr.Destination = destFld[1:]
+	} else if rtCdr.Destination, hasKey = fsCdr[destFld]; !hasKey && fieldsMandatory {
+		return nil, errors.New(fmt.Sprintf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, destFld))
+	}
+	if aTimeStr, hasKey = fsCdr[answerTimeFld]; !hasKey && fieldsMandatory && !strings.HasPrefix(answerTimeFld, utils.STATIC_VALUE_PREFIX) {
+		return nil, errors.New(fmt.Sprintf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, answerTimeFld))
+	} else {
+		if strings.HasPrefix(answerTimeFld, utils.STATIC_VALUE_PREFIX) {
+			aTimeStr = answerTimeFld[1:]
+		}
+		if rtCdr.AnswerTime, err = utils.ParseTimeDetectLayout(aTimeStr); err != nil && fieldsMandatory {
+			return nil, err
+		}
+	}
+	if durStr, hasKey = fsCdr[durationFld]; !hasKey && fieldsMandatory && !strings.HasPrefix(durationFld, utils.STATIC_VALUE_PREFIX){
+		return nil, errors.New(fmt.Sprintf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, durationFld))
+	} else {
+		if strings.HasPrefix(durationFld, utils.STATIC_VALUE_PREFIX) {
+			durStr = durationFld[1:]
+		}
+		if rtCdr.Duration, err = utils.ParseDurationWithSecs(durStr); err != nil && fieldsMandatory {
+			return nil, err
+		}
+	}
+	rtCdr.ExtraFields = make(map[string]string, len(extraFlds))
+	for _, fldName := range extraFlds {
+		if fldVal, hasKey := fsCdr[fldName]; !hasKey && fieldsMandatory {
+			return nil, errors.New(fmt.Sprintf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, fldName))
+		} else {
+			rtCdr.ExtraFields[fldName] = fldVal
+		}
+	}
+	return rtCdr, nil
 }
diff --git a/cdrs/fscdr_test.go b/cdrs/fscdr_test.go
index daeea72f8..2e43bf73e 100644
--- a/cdrs/fscdr_test.go
+++ b/cdrs/fscdr_test.go
@@ -22,6 +22,7 @@ import (
 	"github.com/cgrates/cgrates/config"
 	"github.com/cgrates/cgrates/utils"
 	"testing"
+	"reflect"
 	"time"
 )
 
@@ -92,3 +93,41 @@ func TestCDRFields(t *testing.T) {
 	}
 
 }
+
+func TestFsCdrAsRatedCdr(t *testing.T) {
+	cfg, _ = config.NewDefaultCGRConfig()
+	fsCdr, err := new(FSCdr).New(body)
+	if err != nil {
+		t.Errorf("Error loading cdr: %v", err)
+	}
+	rtCdrOut, err := fsCdr.AsRatedCdr("wholesale_run", "^"+utils.RATED, "^*out", "cgr_tenant", "cgr_tor", "cgr_account", "cgr_subject", "cgr_destination", 
+		"answer_epoch", "billsec", []string{"effective_caller_id_number"}, true)
+	if err != nil {
+		t.Error("Unexpected error received", err)
+	}
+	expctRatedCdr := &utils.RatedCDR{CgrId: utils.FSCgrId("01df56f4-d99a-4ef6-b7fe-b924b2415b7f"), AccId: "01df56f4-d99a-4ef6-b7fe-b924b2415b7f", 
+		CdrHost: "127.0.0.1", CdrSource: FS_CDR_SOURCE, ReqType: utils.RATED,
+		Direction: "*out", Tenant: "ipbx.itsyscom.com", TOR: "call", Account: "dan", Subject: "dan", Destination: "+4986517174963", 
+		AnswerTime: time.Date(2013, 8, 4, 11, 50, 56, 0, time.Local), Duration: time.Duration(4)*time.Second,
+		ExtraFields: map[string]string{"effective_caller_id_number": "+4986517174960"}, MediationRunId: "wholesale_run", Cost: -1}
+	if !reflect.DeepEqual(rtCdrOut, expctRatedCdr) {
+		t.Errorf("Received: %v, expected: %v", rtCdrOut, expctRatedCdr)
+	}
+	rtCdrOut2, err := fsCdr.AsRatedCdr("wholesale_run", "^postpaid", "^*in", "^cgrates.com", "^premium_call", "^first_account", "^first_subject", "cgr_destination", 
+		"^2013-12-07T08:42:26Z", "^12s", []string{"effective_caller_id_number"}, true)
+	if err != nil {
+		t.Error("Unexpected error received", err)
+	}
+	expctRatedCdr2 := &utils.RatedCDR{CgrId: utils.FSCgrId("01df56f4-d99a-4ef6-b7fe-b924b2415b7f"), AccId: "01df56f4-d99a-4ef6-b7fe-b924b2415b7f", CdrHost: "127.0.0.1", 
+		CdrSource: FS_CDR_SOURCE, ReqType: "postpaid",
+		Direction: "*in", Tenant: "cgrates.com", TOR: "premium_call", Account: "first_account", Subject: "first_subject", Destination: "+4986517174963", 
+		AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), Duration: time.Duration(12)*time.Second, 
+		ExtraFields: map[string]string{"effective_caller_id_number": "+4986517174960"}, MediationRunId: "wholesale_run", Cost: -1}
+	if !reflect.DeepEqual(rtCdrOut2, expctRatedCdr2) {
+		t.Errorf("Received: %v, expected: %v", rtCdrOut2, expctRatedCdr2)
+	}
+	_, err = fsCdr.AsRatedCdr("wholesale_run", "dummy_header", "direction", "tenant", "tor", "account", "subject", "destination", "answer_time", "duration", []string{"field_extr1", "fieldextr2"}, true)
+	if err == nil {
+		t.Error("Failed to detect missing header")
+	}
+}
diff --git a/utils/cgrcdr_test.go b/utils/cgrcdr_test.go
index 2172e6b96..751c142cf 100644
--- a/utils/cgrcdr_test.go
+++ b/utils/cgrcdr_test.go
@@ -101,7 +101,7 @@ func TestCgrCdrAsRatedCdr(t *testing.T) {
 		AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), Duration: time.Duration(12)*time.Second, 
 		ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, MediationRunId: "wholesale_run", Cost: -1}
 	if !reflect.DeepEqual(rtCdrOut2, expctRatedCdr2) {
-		t.Errorf("Received: %v, expected: %v", rtCdrOut, expctRatedCdr)
+		t.Errorf("Received: %v, expected: %v", rtCdrOut2, expctRatedCdr2)
 	}
 	_, err = cgrCdr.AsRatedCdr("wholesale_run", "dummy_header", "direction", "tenant", "tor", "account", "subject", "destination", "answer_time", "duration", []string{"field_extr1", "fieldextr2"}, true)
 	if err == nil {