Preparing for mass camp discovery refactor