Refactor + availability zone setup