Merge of refactoring