Refactored related parameters into single Object