Added zones support
fixed manifest to pass new validation