v1.2.26 request

Improve the stability by redesigning classes.