Added missing class parameters, also using them