diff --git a/cross-chain-atomic-swap-cordapp/src/main/kotlin/jp/co/layerx/cordage/crosschainatomicswap/flow/EventWatchFlow.kt b/cross-chain-atomic-swap-cordapp/src/main/kotlin/jp/co/layerx/cordage/crosschainatomicswap/flow/EventWatchFlow.kt
index bd377b2..5ec5d69 100644
--- a/cross-chain-atomic-swap-cordapp/src/main/kotlin/jp/co/layerx/cordage/crosschainatomicswap/flow/EventWatchFlow.kt
+++ b/cross-chain-atomic-swap-cordapp/src/main/kotlin/jp/co/layerx/cordage/crosschainatomicswap/flow/EventWatchFlow.kt
@@ -31,7 +31,7 @@ import org.web3j.protocol.http.HttpService
 @SchedulableFlow
 class EventWatchFlow(private val stateRef: StateRef) : FlowLogic<String>() {
     companion object {
-        // TODO Some ethereum parameters should be imported by .env
+        // TODO Use Node Configuration https://github.com/LayerXcom/cordage/issues/20
         private const val ETHEREUM_RPC_URL = "http://localhost:8545"
         val web3: Web3j = Web3j.build(HttpService(ETHEREUM_RPC_URL))
 
diff --git a/cross-chain-atomic-swap-cordapp/src/main/kotlin/jp/co/layerx/cordage/crosschainatomicswap/flow/StartEventWatchFlow.kt b/cross-chain-atomic-swap-cordapp/src/main/kotlin/jp/co/layerx/cordage/crosschainatomicswap/flow/StartEventWatchFlow.kt
index 35b3e16..b392fd3 100644
--- a/cross-chain-atomic-swap-cordapp/src/main/kotlin/jp/co/layerx/cordage/crosschainatomicswap/flow/StartEventWatchFlow.kt
+++ b/cross-chain-atomic-swap-cordapp/src/main/kotlin/jp/co/layerx/cordage/crosschainatomicswap/flow/StartEventWatchFlow.kt
@@ -23,7 +23,7 @@ import java.math.BigInteger
 @StartableByRPC
 class StartEventWatchFlow(private val proposalStateLinearId: UniqueIdentifier) : FlowLogic<Unit>() {
     companion object {
-        // TODO Some ethereum parameters should be imported by .env
+        // TODO Use Node Configuration https://github.com/LayerXcom/cordage/issues/20
         private const val ETHEREUM_RPC_URL = "http://localhost:8545"
         private const val ETHEREUM_NETWORK_ID = "5777"
         const val EVENT_NAME = "Locked"
diff --git a/cross-chain-atomic-swap-cordapp/src/main/kotlin/jp/co/layerx/cordage/crosschainatomicswap/notary/CustomValidatingNotaryFlow.kt b/cross-chain-atomic-swap-cordapp/src/main/kotlin/jp/co/layerx/cordage/crosschainatomicswap/notary/CustomValidatingNotaryFlow.kt
index ddbb5fb..41e359e 100644
--- a/cross-chain-atomic-swap-cordapp/src/main/kotlin/jp/co/layerx/cordage/crosschainatomicswap/notary/CustomValidatingNotaryFlow.kt
+++ b/cross-chain-atomic-swap-cordapp/src/main/kotlin/jp/co/layerx/cordage/crosschainatomicswap/notary/CustomValidatingNotaryFlow.kt
@@ -21,6 +21,7 @@ import java.math.BigInteger
 
 class CustomValidatingNotaryFlow(otherSide: FlowSession, service: CustomValidatingNotaryService) : ValidatingNotaryFlow(otherSide, service) {
     companion object {
+        // TODO Use Node Configuration https://github.com/LayerXcom/cordage/issues/20
         private const val ETHEREUM_RPC_URL = "http://localhost:8545"
         private const val ETHEREUM_NETWORK_ID = "5777"
         private const val ETHEREUM_PRIVATE_KEY = "0x646f1ce2fdad0e6deeeb5c7e8e5543bdde65e86029e2fd9fc169899c440a7913"
diff --git a/custom-notary-flow/src/main/kotlin/jp/co/layerx/cordage/customnotaryflow/notary/CustomValidatingNotaryFlow.kt b/custom-notary-flow/src/main/kotlin/jp/co/layerx/cordage/customnotaryflow/notary/CustomValidatingNotaryFlow.kt
index e9b6b50..5d0fde7 100644
--- a/custom-notary-flow/src/main/kotlin/jp/co/layerx/cordage/customnotaryflow/notary/CustomValidatingNotaryFlow.kt
+++ b/custom-notary-flow/src/main/kotlin/jp/co/layerx/cordage/customnotaryflow/notary/CustomValidatingNotaryFlow.kt
@@ -59,6 +59,7 @@ class CustomValidatingNotaryFlow(otherSide: FlowSession, service: CustomValidati
         val data = "Terminate: " + agreement.agreementBody
 
         // Add custom verification logic
+        // TODO Use Node Configuration https://github.com/LayerXcom/cordage/issues/20
         val ETHEREUM_RPC_URL = "http://localhost:8545"
         val web3 = Web3j.build(HttpService(ETHEREUM_RPC_URL))
         val tx = Transaction.createFunctionCallTransaction(
diff --git a/flow-ethereum-event-watch/src/main/kotlin/jp/co/layerx/cordage/flowethereumeventwatch/flow/EventWatchFlow.kt b/flow-ethereum-event-watch/src/main/kotlin/jp/co/layerx/cordage/flowethereumeventwatch/flow/EventWatchFlow.kt
index e2847fe..f3365d9 100644
--- a/flow-ethereum-event-watch/src/main/kotlin/jp/co/layerx/cordage/flowethereumeventwatch/flow/EventWatchFlow.kt
+++ b/flow-ethereum-event-watch/src/main/kotlin/jp/co/layerx/cordage/flowethereumeventwatch/flow/EventWatchFlow.kt
@@ -30,7 +30,7 @@ class EventWatchFlow(private val stateRef: StateRef) : FlowLogic<String>() {
     companion object {
         private const val ETHEREUM_RPC_URL = "http://localhost:8545"
         val web3: Web3j = Web3j.build(HttpService(ETHEREUM_RPC_URL))
-        // TODO credentials should be imported by .env
+        // TODO Use Node Configuration https://github.com/LayerXcom/cordage/issues/20
         val credentials: Credentials = Credentials.create("0x4f3edf983ac636a65a842ce7c78d9aa706d3b113bce9c46f30d7d21715b23b1d")
         val eventMapping = mapOf<String, Event>("Set" to SimpleStorage.SET_EVENT)
         object CREATING_WATCHERSTATE: ProgressTracker.Step("Creating new WatcherState.")
diff --git a/flow-ethereum-event-watch/src/main/kotlin/jp/co/layerx/cordage/flowethereumeventwatch/flow/StartEventWatchFlow.kt b/flow-ethereum-event-watch/src/main/kotlin/jp/co/layerx/cordage/flowethereumeventwatch/flow/StartEventWatchFlow.kt
index 9919db0..c4b897a 100644
--- a/flow-ethereum-event-watch/src/main/kotlin/jp/co/layerx/cordage/flowethereumeventwatch/flow/StartEventWatchFlow.kt
+++ b/flow-ethereum-event-watch/src/main/kotlin/jp/co/layerx/cordage/flowethereumeventwatch/flow/StartEventWatchFlow.kt
@@ -19,7 +19,7 @@ import java.math.BigInteger
 @StartableByRPC
 class StartEventWatchFlow(private val searchId: Int) : FlowLogic<Unit>() {
     companion object {
-        // TODO Some ethereum parameters should be imported by .env
+        // TODO Use Node Configuration https://github.com/LayerXcom/cordage/issues/20
         private const val ETHEREUM_RPC_URL = "http://localhost:8545"
         private const val ETHEREUM_NETWORK_ID = "5777"
         const val EVENT_NAME = "Set"
diff --git a/flow-ethereum-tx/src/main/kotlin/jp/co/layerx/cordage/flowethereumtx/Flow.kt b/flow-ethereum-tx/src/main/kotlin/jp/co/layerx/cordage/flowethereumtx/Flow.kt
index 8f3cee0..81baf4d 100644
--- a/flow-ethereum-tx/src/main/kotlin/jp/co/layerx/cordage/flowethereumtx/Flow.kt
+++ b/flow-ethereum-tx/src/main/kotlin/jp/co/layerx/cordage/flowethereumtx/Flow.kt
@@ -10,6 +10,7 @@ import org.web3j.protocol.core.methods.request.Transaction
 import org.web3j.protocol.http.HttpService
 import java.math.BigInteger
 
+// TODO Use Node Configuration https://github.com/LayerXcom/cordage/issues/20
 const val ETHEREUM_RPC_URL = "http://localhost:8545"
 
 @InitiatingFlow