Prepare for next features