More sdk-agnostic code