Added global refactoring