Updates to add options related to OMA processing