Added class for zone generation