Code Changes done for OOF SON use case