Update for gen_server api
Merge branch 'feature-support-new-gen_server-api'