Merge "Refactor ApiOptions for reusability"