Attempt at supporting the new proxy method