Prep for future versions