Getting references refactored