More type support