Adding infrastructure functions.