Refactored examples