Prep for adding profile feature