Added Support for Classes