Make stack parameters more generic