Refactored updating domain options