Prepare for version 6.0