Repackaging for next iteration to allow customization.