Use zone component instead of old global function