Move to version 2.0