0.1.9 Add partial support