Add fill_device option