Updated params to use all available values