Updated to account for new config structure