Integrate add-ons from Martin's session