Modified to reflect unified config setup