Adding missing class parameters (still need to recover the old completed one)