Refactor and new sup/server for zones