Added a few basic classes