CON-420: Moved spotlights to extension