diff --git a/docs/_posts/2017-10-09-release-v0.1.0.md b/docs/_posts/2017-10-09-release-v0.1.0.md
index 317fda0cf..1cb7725ae 100644
--- a/docs/_posts/2017-10-09-release-v0.1.0.md
+++ b/docs/_posts/2017-10-09-release-v0.1.0.md
@@ -8,4 +8,4 @@ tags:
- Release
---
-- Assets -- [v0.1.0.tar.gz](https://github.com/acetcom/nextepc/archive/v0.1.0.tar.gz)
+- Assets -- [v0.1.0.tar.gz](https://github.com/open5gs/nextepc/archive/v0.1.0.tar.gz)
diff --git a/docs/_posts/2017-10-11-release-v0.1.1.md b/docs/_posts/2017-10-11-release-v0.1.1.md
index 704e8e5c3..25bf897b2 100644
--- a/docs/_posts/2017-10-11-release-v0.1.1.md
+++ b/docs/_posts/2017-10-11-release-v0.1.1.md
@@ -8,5 +8,5 @@ tags:
- Release
---
-- Fix the bug related to Mongo C Driver. [[More Info](https://github.com/acetcom/nextepc/commit/4245502ae287df9c457621b3f4cccb519c4d4878)]
-- Assets -- [v0.1.1.tar.gz](https://github.com/acetcom/nextepc/archive/v0.1.1.tar.gz)
+- Fix the bug related to Mongo C Driver. [[More Info](https://github.com/open5gs/nextepc/commit/4245502ae287df9c457621b3f4cccb519c4d4878)]
+- Assets -- [v0.1.1.tar.gz](https://github.com/open5gs/nextepc/archive/v0.1.1.tar.gz)
diff --git a/docs/_posts/2017-11-02-release-v0.2.0.md b/docs/_posts/2017-11-02-release-v0.2.0.md
index 382d21203..bc787e217 100644
--- a/docs/_posts/2017-11-02-release-v0.2.0.md
+++ b/docs/_posts/2017-11-02-release-v0.2.0.md
@@ -11,4 +11,4 @@ tags:
- Publish Debian/Ubuntu Package
- Support FreeBSD and Mac OS X"
-- Assets -- [v0.2.0.tar.gz](https://github.com/acetcom/nextepc/archive/v0.2.0.tar.gz)
+- Assets -- [v0.2.0.tar.gz](https://github.com/open5gs/nextepc/archive/v0.2.0.tar.gz)
diff --git a/docs/_posts/2017-12-18-release-v0.3.0.md b/docs/_posts/2017-12-18-release-v0.3.0.md
index 15ec42a68..cdbf7fbe9 100644
--- a/docs/_posts/2017-12-18-release-v0.3.0.md
+++ b/docs/_posts/2017-12-18-release-v0.3.0.md
@@ -11,4 +11,4 @@ tags:
- IPv6 Support (Linux Only)
- Change Configuration File (JSON -> YAML)
-- Assets -- [v0.3.0.tar.gz](https://github.com/acetcom/nextepc/archive/v0.3.0.tar.gz)
+- Assets -- [v0.3.0.tar.gz](https://github.com/open5gs/nextepc/archive/v0.3.0.tar.gz)
diff --git a/docs/_posts/2017-12-31-release-v0.3.1.md b/docs/_posts/2017-12-31-release-v0.3.1.md
index ed65a62af..c34a2c198 100644
--- a/docs/_posts/2017-12-31-release-v0.3.1.md
+++ b/docs/_posts/2017-12-31-release-v0.3.1.md
@@ -8,5 +8,5 @@ tags:
- Release
---
-- Add Authentication Synch Failure ([#11](https://github.com/acetcom/nextepc/issues/11)) -- [eric80s](https://github.com/eric80s)
-- Assets -- [v0.3.1.tar.gz](https://github.com/acetcom/nextepc/archive/v0.3.1.tar.gz)
+- Add Authentication Synch Failure ([#11](https://github.com/open5gs/nextepc/issues/11)) -- [eric80s](https://github.com/eric80s)
+- Assets -- [v0.3.1.tar.gz](https://github.com/open5gs/nextepc/archive/v0.3.1.tar.gz)
diff --git a/docs/_posts/2018-02-13-release-v0.3.3.md b/docs/_posts/2018-02-13-release-v0.3.3.md
index 1ae1fc8df..299e101f0 100644
--- a/docs/_posts/2018-02-13-release-v0.3.3.md
+++ b/docs/_posts/2018-02-13-release-v0.3.3.md
@@ -10,11 +10,11 @@ head_inline: ""
---
#### New
-- Docker support ([#16](https://github.com/acetcom/nextepc/issues/16)) -- [amilenovic](https://github.com/amilenovic)
+- Docker support ([#16](https://github.com/open5gs/nextepc/issues/16)) -- [amilenovic](https://github.com/amilenovic)
#### Bug fixes
-- Fix the BUG for MAC failure of authentication failure -- [#17](https://github.com/acetcom/nextepc/issues/17) from [razaborg](https://github.com/razaborg)
-- Fix the BUG for EPS attach type of Attach accept -- [#12](https://github.com/acetcom/nextepc/issues/12) from [pcminitech](https://github.com/pcminitech)
+- Fix the BUG for MAC failure of authentication failure -- [#17](https://github.com/open5gs/nextepc/issues/17) from [razaborg](https://github.com/razaborg)
+- Fix the BUG for EPS attach type of Attach accept -- [#12](https://github.com/open5gs/nextepc/issues/12) from [pcminitech](https://github.com/pcminitech)
-Download -- [v0.3.3.tar.gz](https://github.com/acetcom/nextepc/archive/v0.3.3.tar.gz)
+Download -- [v0.3.3.tar.gz](https://github.com/open5gs/nextepc/archive/v0.3.3.tar.gz)
{: .notice--info}
diff --git a/docs/_posts/2018-03-06-release-v0.3.5.md b/docs/_posts/2018-03-06-release-v0.3.5.md
index ff0daa045..597940a78 100644
--- a/docs/_posts/2018-03-06-release-v0.3.5.md
+++ b/docs/_posts/2018-03-06-release-v0.3.5.md
@@ -10,11 +10,11 @@ head_inline: ""
---
#### New
-- Support Network Name ([#22](https://github.com/acetcom/nextepc/pull/22)) -- [medeiros405](https://github.com/medeiros405)
+- Support Network Name ([#22](https://github.com/open5gs/nextepc/pull/22)) -- [medeiros405](https://github.com/medeiros405)
#### Bug fixes
-- Fix the BUG for security capabilities mismatch ([#27](https://github.com/acetcom/nextepc/issues/27)) -- [wayne43290](https://github.com/wayne43290)
-- Fix the BUG that SGW process is dead during paging process ([#18](https://github.com/acetcom/nextepc/issues/18)) -- [jackson040407](https://github.com/jackson040407)
+- Fix the BUG for security capabilities mismatch ([#27](https://github.com/open5gs/nextepc/issues/27)) -- [wayne43290](https://github.com/wayne43290)
+- Fix the BUG that SGW process is dead during paging process ([#18](https://github.com/open5gs/nextepc/issues/18)) -- [jackson040407](https://github.com/jackson040407)
-Download -- [v0.3.5.tar.gz](https://github.com/acetcom/nextepc/archive/v0.3.5.tar.gz)
+Download -- [v0.3.5.tar.gz](https://github.com/open5gs/nextepc/archive/v0.3.5.tar.gz)
{: .notice--info}
diff --git a/docs/_posts/2018-03-21-release-v0.3.6.md b/docs/_posts/2018-03-21-release-v0.3.6.md
index 8ec1425d0..840b87f04 100644
--- a/docs/_posts/2018-03-21-release-v0.3.6.md
+++ b/docs/_posts/2018-03-21-release-v0.3.6.md
@@ -8,8 +8,8 @@ tags:
- Release
---
-- Support eNB/MME Configuration Transfer, Error Indication ([#29](https://github.com/acetcom/nextepc/issues/29)) -- [wayne43290](https://github.com/wayne43290)
-- Increase SCTP recv buffer : 2048->8192 ([#35](https://github.com/acetcom/nextepc/issues/35)) -- [EugeneBogush](https://github.com/EugeneBogush)
+- Support eNB/MME Configuration Transfer, Error Indication ([#29](https://github.com/open5gs/nextepc/issues/29)) -- [wayne43290](https://github.com/wayne43290)
+- Increase SCTP recv buffer : 2048->8192 ([#35](https://github.com/open5gs/nextepc/issues/35)) -- [EugeneBogush](https://github.com/EugeneBogush)
-Download -- [v0.3.6.tar.gz](https://github.com/acetcom/nextepc/archive/v0.3.6.tar.gz)
+Download -- [v0.3.6.tar.gz](https://github.com/open5gs/nextepc/archive/v0.3.6.tar.gz)
{: .notice--info}
diff --git a/docs/_posts/2018-04-14-release-v0.3.7.md b/docs/_posts/2018-04-14-release-v0.3.7.md
index fafb73949..ef9c6c3a8 100644
--- a/docs/_posts/2018-04-14-release-v0.3.7.md
+++ b/docs/_posts/2018-04-14-release-v0.3.7.md
@@ -8,5 +8,5 @@ tags:
- Release
---
-Download -- [v0.3.7.tar.gz](https://github.com/acetcom/nextepc/archive/v0.3.7.tar.gz)
+Download -- [v0.3.7.tar.gz](https://github.com/open5gs/nextepc/archive/v0.3.7.tar.gz)
{: .notice--info}
diff --git a/docs/_posts/2018-06-03-release-v0.3.9.md b/docs/_posts/2018-06-03-release-v0.3.9.md
index d152f919d..d3463e5e8 100644
--- a/docs/_posts/2018-06-03-release-v0.3.9.md
+++ b/docs/_posts/2018-06-03-release-v0.3.9.md
@@ -13,11 +13,11 @@ head_inline: ""
- Support NAS encryption(EEA1/EEA2/EEA3)
#### Bug fixes
-- Confirm with 36.412 requirement of SCTP stream id ([#54](https://github.com/acetcom/nextepc/issues/54)) -- [brchiu](https://github.com/brchiu)
-- Fix to set correct timezone in UE ([#61](https://github.com/acetcom/nextepc/pull/61)) -- [medeiros405](https://github.com/medeiros405)
-- Fix to change MME's integrity order ([#64](https://github.com/acetcom/nextepc/issues/64)) -- [kewinrausch](https://github.com/kewinrausch)
-- Fix the bug for tracking area update ([#29](https://github.com/acetcom/nextepc/issues/29)) -- [wayne43290](https://github.com/wayne43290)
-- Fix the bug for indirect tunnel ([#29](https://github.com/acetcom/nextepc/issues/29)) -- [wayne43290](https://github.com/wayne43290)
+- Confirm with 36.412 requirement of SCTP stream id ([#54](https://github.com/open5gs/nextepc/issues/54)) -- [brchiu](https://github.com/brchiu)
+- Fix to set correct timezone in UE ([#61](https://github.com/open5gs/nextepc/pull/61)) -- [medeiros405](https://github.com/medeiros405)
+- Fix to change MME's integrity order ([#64](https://github.com/open5gs/nextepc/issues/64)) -- [kewinrausch](https://github.com/kewinrausch)
+- Fix the bug for tracking area update ([#29](https://github.com/open5gs/nextepc/issues/29)) -- [wayne43290](https://github.com/wayne43290)
+- Fix the bug for indirect tunnel ([#29](https://github.com/open5gs/nextepc/issues/29)) -- [wayne43290](https://github.com/wayne43290)
-Download -- [v0.3.9.tar.gz](https://github.com/acetcom/nextepc/archive/v0.3.9.tar.gz)
+Download -- [v0.3.9.tar.gz](https://github.com/open5gs/nextepc/archive/v0.3.9.tar.gz)
{: .notice--info}
diff --git a/docs/_posts/2018-08-17-release-v0.3.10.md b/docs/_posts/2018-08-17-release-v0.3.10.md
index 8a7952829..95a264dda 100644
--- a/docs/_posts/2018-08-17-release-v0.3.10.md
+++ b/docs/_posts/2018-08-17-release-v0.3.10.md
@@ -10,12 +10,12 @@ head_inline: ""
---
#### Bug fixes
- - Renew freeDiameter Certificate ([#93](https://github.com/acetcom/nextepc/issues/93), [#94](https://github.com/acetcom/nextepc/issues/94)) -- [Ravi-t](https://github.com/Ravi-t), [hchenji](https://github.com/hchenji)
- - Fix TLV uint32 bug ([#73](https://github.com/acetcom/nextepc/pull/73)) -- [giuliol](https://github.com/giuliol)
- - Add TRACE for IP address of connected UEs ([#71](https://github.com/acetcom/nextepc/issues/71)) -- [pgupta408](https://github.com/Ravi-t)
- - Show reason string for YAML parser error ([#40](https://github.com/acetcom/nextepc/issues/40)) -- [Raw1mage](https://github.com/Raw1mage)
+ - Renew freeDiameter Certificate ([#93](https://github.com/open5gs/nextepc/issues/93), [#94](https://github.com/open5gs/nextepc/issues/94)) -- [Ravi-t](https://github.com/Ravi-t), [hchenji](https://github.com/hchenji)
+ - Fix TLV uint32 bug ([#73](https://github.com/open5gs/nextepc/pull/73)) -- [giuliol](https://github.com/giuliol)
+ - Add TRACE for IP address of connected UEs ([#71](https://github.com/open5gs/nextepc/issues/71)) -- [pgupta408](https://github.com/Ravi-t)
+ - Show reason string for YAML parser error ([#40](https://github.com/open5gs/nextepc/issues/40)) -- [Raw1mage](https://github.com/Raw1mage)
- Fix compile error for GCC 8.1
- Fix compile error for Mongo-C-Driver 1.11
-Download -- [v0.3.10.tar.gz](https://github.com/acetcom/nextepc/archive/v0.3.10.tar.gz)
+Download -- [v0.3.10.tar.gz](https://github.com/open5gs/nextepc/archive/v0.3.10.tar.gz)
{: .notice--info}
diff --git a/docs/_posts/2019-04-28-release-v0.3.11.md b/docs/_posts/2019-04-28-release-v0.3.11.md
index 0ac3233af..f7daf6c14 100644
--- a/docs/_posts/2019-04-28-release-v0.3.11.md
+++ b/docs/_posts/2019-04-28-release-v0.3.11.md
@@ -10,19 +10,19 @@ head_inline: ""
---
#### Enhancements
-- Support 4-bytes RES in NAS Auth ([#147](https://github.com/acetcom/nextepc/issues/147)) -- [Ranjjiitsingh](https://github.com/Ranjjiitsingh)
-- Add SGW selection mode ([#100](https://github.com/acetcom/nextepc/pull/100)) -- [TerryAlu](https://github.com/TerryAlu)
+- Support 4-bytes RES in NAS Auth ([#147](https://github.com/open5gs/nextepc/issues/147)) -- [Ranjjiitsingh](https://github.com/Ranjjiitsingh)
+- Add SGW selection mode ([#100](https://github.com/open5gs/nextepc/pull/100)) -- [TerryAlu](https://github.com/TerryAlu)
#### Bug fixes
-- Increase packet memory buffer ([#161](https://github.com/acetcom/nextepc/issues/161)) -- [mathieuxilan](https://github.com/mathieuxilan)
-- Fix setting END-ID to 0 ([#156](https://github.com/acetcom/nextepc/issues/156)) -- [hypercloud2017](https://github.com/hypercloud2017)
-- Fix incorrect timezone in NAS & GTP ([#140](https://github.com/acetcom/nextepc/issues/140)) -- [EugeneBogush](https://github.com/EugeneBogush)
+- Increase packet memory buffer ([#161](https://github.com/open5gs/nextepc/issues/161)) -- [mathieuxilan](https://github.com/mathieuxilan)
+- Fix setting END-ID to 0 ([#156](https://github.com/open5gs/nextepc/issues/156)) -- [hypercloud2017](https://github.com/hypercloud2017)
+- Fix incorrect timezone in NAS & GTP ([#140](https://github.com/open5gs/nextepc/issues/140)) -- [EugeneBogush](https://github.com/EugeneBogush)
#### Miscellaneous
-- nas_message.py: Fix copy+paste error([#159](https://github.com/acetcom/nextepc/issues/159)) -- [laf0rge](https://github.com/laf0rge)
-- Fix missing 'break' statement ([#129](https://github.com/acetcom/nextepc/pull/129)) -- [EugeneBogush](https://github.com/EugeneBogush)
-- Add missing C namespace ([#109](https://github.com/acetcom/nextepc/pull/109)) -- [brchiu](https://github.com/brchiu)
+- nas_message.py: Fix copy+paste error([#159](https://github.com/open5gs/nextepc/issues/159)) -- [laf0rge](https://github.com/laf0rge)
+- Fix missing 'break' statement ([#129](https://github.com/open5gs/nextepc/pull/129)) -- [EugeneBogush](https://github.com/EugeneBogush)
+- Add missing C namespace ([#109](https://github.com/open5gs/nextepc/pull/109)) -- [brchiu](https://github.com/brchiu)
- Refine EXIT routine for daemon process
-Download -- [v0.3.11.tar.gz](https://github.com/acetcom/nextepc/archive/v0.3.11.tar.gz)
+Download -- [v0.3.11.tar.gz](https://github.com/open5gs/nextepc/archive/v0.3.11.tar.gz)
{: .notice--info}
diff --git a/docs/_posts/2019-04-29-release-v0.4.0.md b/docs/_posts/2019-04-29-release-v0.4.0.md
new file mode 100644
index 000000000..04b719504
--- /dev/null
+++ b/docs/_posts/2019-04-29-release-v0.4.0.md
@@ -0,0 +1,20 @@
+---
+title: "v0.4.0 - Integration with OGSLib"
+date: 2019-04-29 23:44:00 +0900
+categories:
+ - Release
+tags:
+ - News
+ - Release
+head_inline: ""
+---
+
+#### Enhancements
+- Integration with OGSLib
+- High CPU usage on idle ([#87](https://github.com/open5gs/nextepc/issues/87)) -- [hchenji](https://github.com/hchenji)
+
+#### Bug fixes
+- The problem related to MNC of LENGTH 3 ([#163](https://github.com/open5gs/nextepc/issues/163)) -- [Avi-Dekra](https://github.com/Avi-Dekra)
+
+Download -- [v0.4.0.tar.gz](https://github.com/open5gs/nextepc/archive/v0.4.0.tar.gz)
+{: .notice--info}
diff --git a/lib/ogslib b/lib/ogslib
index f4966d98f..e34d0156e 160000
--- a/lib/ogslib
+++ b/lib/ogslib
@@ -1 +1 @@
-Subproject commit f4966d98faf7e56837c3455003258060674a9628
+Subproject commit e34d0156ea88b2f982c94e9adc3942b823f84e12
diff --git a/src/app_init.h b/src/app_init.h
index 107248055..c76ed24d6 100644
--- a/src/app_init.h
+++ b/src/app_init.h
@@ -8,7 +8,7 @@ extern "C" {
int app_initialize(app_param_t *param);
#define app_terminate epc_terminate
-int epc_initialize();
+int epc_initialize(app_param_t *param);
void epc_terminate(void);
int mme_initialize();