Merge AM+ into EnhancedStops