Added more parameter substitution.