Added some anonymous and generic classes