Refactoring Shell addon