Add variable replacement