Prepare for version 2