Move method to interface
Merge branch 'master' into toronto
Fix for refactoring in master branch