Updated shell variables to be more generic