Adapt more pattern
v0.0.5