Added a few stubbed-out classes