Added some key classes