Added additional classes in reference to last commit.