Stream-lined the code based on the data available in the current providers