add some features for 2.1.0