Modified to use alternative configuration