bugid-93724 | WAM Api - options refactor