Re-added 2 classes, missing in yesterday commit.