Enhance example generality