[ADD] Added part of gateway advertisement and discovery logic