Improved SDK build