SDK improvements & testing;