0.1.2: more types supported