Add the classes that should have been included in the immediately
previous commit.