Modified to work with the zone extension implementation so far.