Prepare some features for next version