Implement replacements, optionality, and expansion