Remove Template dependency from FreiSong