Update for zero config setup