Feature/next url age gateway