Improvement of Zone schema