Doing enter parameters more flexible