Introducing the Edition model, and some tweaks to the setup process