Added some simple classes