Ready to extract changes for visitor pattern