Can you check if we can use some of the OAE apis for this? (that can be in a follow-up PR though)