Added Zone interface, cleaned Zone