Added some sdk handling