Added some basic classes