Updated to comply with new config structure