Setup process improvements