Type safety for interpolation
Merge pull request #3 from anchor/refactor-type-safety

Type safety for interpolation