FIX: Add entries for other raw types