More updates to new plan creation