Add typed versions