Further improvements
Update class params
Complete optional parameter pages