Refactor to use dto-immutable-parameter classes separately