Added some class parameters