Improve zaw config