Add some features to mainline