diff --git a/src/main/java/com/nisum/paymentvendorsimulator/creditcard/domain/dto/CreditCardAdditionalData.java b/src/main/java/com/nisum/paymentvendorsimulator/creditcard/domain/dto/CreditCardAdditionalData.java
index c008e22fe08d478dda05c4686096f62a2936cd61..ae9cb26f393440a9eee3cc89ed34d33ccc27d276 100644
--- a/src/main/java/com/nisum/paymentvendorsimulator/creditcard/domain/dto/CreditCardAdditionalData.java
+++ b/src/main/java/com/nisum/paymentvendorsimulator/creditcard/domain/dto/CreditCardAdditionalData.java
@@ -11,34 +11,34 @@ import lombok.Setter;
 @NoArgsConstructor
 public class CreditCardAdditionalData {
 
-  private String avsResult;
-  private String cardSummary;
-  private String refusalReasonRaw;
-  private String eci;
-  private String acquirerAccountCode;
-  private String expiryDate;
-  private String xid;
-  private String cavvAlgorithm;
-  private String cardBin;
-  private String threeDAuthenticated;
-  private String cvcResultRaw;
-  private String paymentMethodVariant;
-  private String acquirerReference;
-  private String cardIssuingCountry;
-  private String liabilityShift;
-  private String authCode;
-  private String cardHolderName;
-  private String isCardCommercial;
-  private String threeDOffered;
-  private String threeDOfferedResponse;
-  private String authorisationMid;
-  private String issuerCountry;
-  private String cvcResult;
-  private String cavv;
-  private String threeDAuthenticatedResponse;
-  private String avsResultRaw;
-  private String paymentMethod;
-  private String cardPaymentMethod;
-  private String acquirerCode;
+  private String avsResult = "4 AVS not supported for this card type";
+  private String cardSummary = "1111";
+  private String refusalReasonRaw = "AUTHORISED";
+  private String eci = "N/A";
+  private String acquirerAccountCode = "TestPmmAcquirerAccount";
+  private String expiryDate = "8/2018";
+  private String xid = "N/A";
+  private String cavvAlgorithm = "N/A";
+  private String cardBin = "411111";
+  private String threeDAuthenticated = "false";
+  private String cvcResultRaw = "1";
+  private String paymentMethodVariant = "visa";
+  private String acquirerReference = "7CAI01SQB4C";
+  private String cardIssuingCountry = "NL";
+  private String liabilityShift = "false";
+  private String authCode = "52328";
+  private String cardHolderName = "Naga Bolla";
+  private String isCardCommercial = "unknown";
+  private String threeDOffered = "false";
+  private String threeDOfferedResponse = "N/A";
+  private String authorisationMid = "1000";
+  private String issuerCountry = "NL";
+  private String cvcResult = "1 Matches";
+  private String cavv = "N/A";
+  private String threeDAuthenticatedResponse = "N/A";
+  private String avsResultRaw = "4";
+  private String paymentMethod = "visa";
+  private String cardPaymentMethod = "visa";
+  private String acquirerCode = "TestPmmAcquirer";
 
 }
diff --git a/src/main/java/com/nisum/paymentvendorsimulator/creditcard/domain/dto/CreditCardAuthorizeResponse.java b/src/main/java/com/nisum/paymentvendorsimulator/creditcard/domain/dto/CreditCardAuthorizeResponse.java
index b70a3d489a059bd1c14f72f5dfcbd2db52956801..5c2591d3526e5bc98651110207dca47f64314e8a 100644
--- a/src/main/java/com/nisum/paymentvendorsimulator/creditcard/domain/dto/CreditCardAuthorizeResponse.java
+++ b/src/main/java/com/nisum/paymentvendorsimulator/creditcard/domain/dto/CreditCardAuthorizeResponse.java
@@ -12,8 +12,8 @@ import lombok.Setter;
 public class CreditCardAuthorizeResponse {
 
   CreditCardAdditionalData additionalData;
-  private String pspReference;
-  private String resultCode;
-  private String authCode;
+  private String pspReference = "8525125417115";
+  private String resultCode = "Authorised";
+  private String authCode = "52329";
 
 }
diff --git a/src/main/java/com/nisum/paymentvendorsimulator/creditcard/domain/dto/CreditCardRequest.java b/src/main/java/com/nisum/paymentvendorsimulator/creditcard/domain/dto/CreditCardRequest.java
index 2eb1675dc765e7ae9933fdaa75a6ce7085deacb2..3bec8877a0cde0bbc6e12b70336489b9b6503d2f 100644
--- a/src/main/java/com/nisum/paymentvendorsimulator/creditcard/domain/dto/CreditCardRequest.java
+++ b/src/main/java/com/nisum/paymentvendorsimulator/creditcard/domain/dto/CreditCardRequest.java
@@ -14,15 +14,7 @@ public class CreditCardRequest {
   CreditCardAmount amount;
   String reference;
   String merchantAccount;
+  CreditCardAddress billingAddress;
 //  String returnUrl; // for Adyen payment, not classic integration, do we need?
 
-  @Override
-  public String toString() {
-    return "CreditCardRequest{" +
-            "card=" + card +
-            ", amount=" + amount +
-            ", reference='" + reference + '\'' +
-            ", merchantAccount='" + merchantAccount + '\'' +
-            '}';
-  }
 }
diff --git a/src/main/java/com/nisum/paymentvendorsimulator/creditcard/services/CreditCardService.java b/src/main/java/com/nisum/paymentvendorsimulator/creditcard/services/CreditCardService.java
index 6bb985de6f7f1e26febccf80ee4b23e5b67a0d59..973114ea7f12c8e5fde51ced7e41e4c9c9563323 100644
--- a/src/main/java/com/nisum/paymentvendorsimulator/creditcard/services/CreditCardService.java
+++ b/src/main/java/com/nisum/paymentvendorsimulator/creditcard/services/CreditCardService.java
@@ -23,8 +23,9 @@ public class CreditCardService {
     CreditCardResponse res = new CreditCardResponse();
     res.setCardNumber(ccRequest.getCard().getNumber());
     res.setCvv(ccRequest.getCard().getCvc());
+    res.setId("123456789");
 
-    CreditCardAddress ccAddress = new CreditCardAddress("5708 Owens Dr", "APT 106","Pleasanton", "USA", "USA", "94588" );
+    CreditCardAddress ccAddress = ccRequest.getBillingAddress();
     res.setBillingAddress(ccAddress);
 
     res.setAmount(ccRequest.getAmount().getValue());