Started merging SOA model into Zone model