Added container variants of id and point. Closes #353.