Implement new prefixing behavior