Refactored fetch payment options