Updating variables to be more generic