Added logic to handle when a white list is not provided