Prepare for manifest 2