Added addon for staging environment