Moved features to release 2.0.0