Changed Parameters to a Dictionary