Improve gateway descriptions