Rework towards making Contexts copyable