[smotri] Adapt to new API and modernize