Version 2.1.0.0: Implementing More Fields to Replace and More Macros to Replace with