Add more want scalar types
Align want functions alphabeticly