#52 Enhance to start to suppport API gateway.