Fixing snippets to be inline with latest SDK