Aligned on new smack API