Handle more types