FIX: Add more datatypes