SDK improvements