Expand Age Gateway stub