Added token replacement plugin