Added more replacement tokens