Major rework towards 4.0.1