More changes to blueprint inclusion