Added support for replacement tokens