Prepare for next version of CommonSense