Updated with new configuration