Updated to have all correct configurations