Added basic changes for version 2.0