Refactoring old reference