Added features 2.0-beta1