Added the API gateway pattern (finally!)