Made some parameters final