Changed function name for support in prod environment