Improvements to classes not require so many parameters