Use new extension system