Updated for no provider prefix