added classes referenced by previous commit.