Modularized Zone Management code