Add some features(see changelog)