Added default values for headless systems