SDK improvements;