Refactoring - security API change.