Added some basic support for classes