Major changes, bumped version to v2.0.0