@eachillah @rugute looping in @AMPATH team as this is part of their requirements as they move to Migrate to O3.