Add gateway samples