Adopts to new SDK version