Added the missing classes from previous commit.