Close #1: Add all single value types