Updated features to the 2.x branch