Param interpolation

Missing commits from previous pull request