Added a few classes that were missed initially.